bitkeeper revision 1.1159.189.3 (41a4d3a4O06koY83sc_3qK0y4QiJiw)

entry.S:
  sync w/ head.

diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
index aa94f228b43bece2ca1047efc989160b6dcd915f..f696eed63af48f0e6c143823d4505840166c3af7 100644 (file)
--- a/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@ -289,7 +289,7 @@ test_all_events:
         movw %ax,TRAPBOUNCE_cs(%edx)
         movw $TBF_INTERRUPT,TRAPBOUNCE_flags(%edx)
         call create_bounce_frame
-        movl DOMAIN_shared_info(%ebx),%eax
+        movl EDOMAIN_vcpu_info(%ebx),%eax
         movb $1,VCPUINFO_upcall_mask(%eax) # Upcalls are masked during delivery
         jmp  restore_all_guest